Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 44714 manually #47824

Merged
merged 4 commits into from
Jun 21, 2017
Merged

Revert 44714 manually #47824

merged 4 commits into from
Jun 21, 2017

Conversation

mbohlool
Copy link
Contributor

@mbohlool mbohlool commented Jun 21, 2017

#44714 broke backward compatibility for old swagger spec that kubectl still uses. The decision on #47448 was to revert this change but the change was not automatically revertible. Here I semi-manually remove all references to UnixUserID and UnixGroupID and updated generated files accordingly.

Please wait for tests to pass then review that as there may still be tests that are failing.

Fixes #47448

Adding release note just because the original PR has a release note. If possible, we should remove both release notes as they cancel each other.

Release note: (removed by caesarxuchao)

UnixUserID and UnixGroupID is reverted back as int64 to keep backward compatibility.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 21, 2017
@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jun 21, 2017
@mbohlool mbohlool force-pushed the revert2 branch 3 times, most recently from 7c7688d to effb54e Compare June 21, 2017 10:04
@mbohlool mbohlool changed the title Revert 44714 manually [WIP] Revert 44714 manually Jun 21, 2017
@mbohlool mbohlool assigned mbohlool and unassigned yujuhong Jun 21, 2017
@caesarxuchao
Copy link
Member

/test pull-kubernetes-e2e-gce-etcd3

@mbohlool mbohlool changed the title [WIP] Revert 44714 manually Revert 44714 manually Jun 21, 2017
@caesarxuchao
Copy link
Member

Probably we should nuke the release note in the original PR and this PR.

@caesarxuchao
Copy link
Member

The manual changes look good. The original PR touched 120 files, this one touched 117 files, wonder what are missed.

@dchen1107 dchen1107 assigned dchen1107 and caesarxuchao and unassigned mbohlool Jun 21, 2017
@caesarxuchao
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 21, 2017
@caesarxuchao
Copy link
Member

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 21, 2017
@dchen1107
Copy link
Member

/lgtm

xref: #38120

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, dchen1107, mbohlool

Associated issue: 44714

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2017
@caesarxuchao
Copy link
Member

This is blocking lifting code freeze, so apply the label.

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 47851, 47824, 47858, 46099)

@k8s-github-robot k8s-github-robot merged commit 03014f4 into kubernetes:master Jun 21, 2017
@mbohlool mbohlool mentioned this pull request Jun 22, 2017
dims pushed a commit to dims/kubernetes that referenced this pull request Feb 8, 2018
Automatic merge from submit-queue (batch tested with PRs 47851, 47824, 47858, 46099)

Revert 44714 manually

kubernetes#44714 broke backward compatibility for old swagger spec that kubectl still uses. The decision on kubernetes#47448 was to revert this change but the change was not automatically revertible. Here I semi-manually remove all references to UnixUserID and UnixGroupID and updated generated files accordingly.

Please wait for tests to pass then review that as there may still be tests that are failing.

Fixes kubernetes#47448

Adding release note just because the original PR has a release note. If possible, we should remove both release notes as they cancel each other.

**Release note**: (removed by caesarxuchao)

UnixUserID and UnixGroupID is reverted back as int64 to keep backward compatibility.
k8s-github-robot pushed a commit that referenced this pull request May 4, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use single struct in internal type to reduce difference with external type

**What this PR does / why we need it**:
This PR reduces the differences between internal and external types by removing leftovers after revert of one of the changes.

**Special notes for your reviewer**:
We had `IDRange` in both types prior 9440a68 commit (#44714) that splitted it into `UserIDRange`/`GroupIDRange`. Later, in c91a12d commit (#47824) we had to revert these changes because they broke backward compatibility but `UserIDRange`/`GroupIDRange` structs were left in the internal type.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants